Skip to content

Strip off rc, etc. from version used for spack branch names #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Oct 29, 2025
Merged

Strip off rc, etc. from version used for spack branch names #317

merged 2 commits into from
Oct 29, 2025

Conversation

@xylar
Copy link
Collaborator

@xylar xylar commented Oct 29, 2025 •
edited
Loading

Checklist

  • Testing comment, if appropriate, in the PR documents testing used to verify the changes

@xylar xylar requested a review from andrewdnolan October 29, 2025 17:25
@xylar
Copy link
Collaborator Author

xylar commented Oct 29, 2025

Testing

I used this (via the update-to-2.0.0 branch) as part of deploying E3SM-Unified 1.12.0rc3 on Compy. I can see that it is using the spack_for_mache_2.0.0 branch as expected, rather than spack_for_mache_2.0.0rc2.

if [ -d /share/apps/E3SM/conda_envs/e3smu_1_12_0rc3/compy/spack/gnu_openmpi ]; then
  cd /share/apps/E3SM/conda_envs/e3smu_1_12_0rc3/compy/spack/gnu_openmpi
  git fetch origin
  git reset --hard origin/spack_for_mache_2.0.0
else
  git clone -b spack_for_mache_2.0.0 [email protected]:E3SM-Project/spack.git /share/apps/E3SM/conda_envs/e3smu_1_12_0rc3/compy/spack/gnu_openmpi
  cd /share/apps/E3SM/conda_envs/e3smu_1_12_0rc3/compy/spack/gnu_openmpi
fi

@xylar
Copy link
Collaborator Author

xylar commented Oct 29, 2025

@andrewdnolan, can you please review based on your testing?

@andrewdnolan
Copy link
Collaborator

andrewdnolan commented Oct 29, 2025

Testing

On aurora I see the same thing:

if [ -d /lus/flare/projects/E3SMinput/soft/e3sm-unified/e3smu_1_12_0rc3/aurora/spack/oneapi-ifx_mpich ]; then
  cd /lus/flare/projects/E3SMinput/soft/e3sm-unified/e3smu_1_12_0rc3/aurora/spack/oneapi-ifx_mpich
  git fetch origin
  git reset --hard origin/spack_for_mache_2.0.0
else
  git clone -b spack_for_mache_2.0.0 [email protected]:E3SM-Project/spack.git /lus/flare/projects/E3SMinput/soft/e3sm-unified/e3smu_1_12_0rc3/aurora/spack/oneapi-ifx_mpich
  cd /lus/flare/projects/E3SMinput/soft/e3sm-unified/e3smu_1_12_0rc3/aurora/spack/oneapi-ifx_mpich
fi

@xylar xylar merged commit 1879a46 into E3SM-Project:main Oct 29, 2025
5 checks passed
@xylar xylar deleted the strip-rc-from-spack-for-mache-version branch October 29, 2025 20:15
@xylar xylar self-assigned this Oct 29, 2025
@xylar xylar added the bug Something isn't working label Oct 29, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@andrewdnolan andrewdnolan andrewdnolan approved these changes

Assignees

@xylar xylar

Labels

bug Something isn't working

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@xylar @andrewdnolan